@@ -103,11 +103,11 @@ def clerk_list(request): |
||
| 103 | 103 |
admin_id = request.session.get('admin_id')
|
| 104 | 104 |
|
| 105 | 105 |
try: |
| 106 |
- administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True).order_by('-pk')
|
|
| 106 |
+ administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True) |
|
| 107 | 107 |
except AdministratorInfo.DoesNotExist: |
| 108 | 108 |
return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND) |
| 109 | 109 |
|
| 110 |
- clerks = SaleclerkInfo.objects.filter(brand_id=administrator.brand_id, status=True) |
|
| 110 |
+ clerks = SaleclerkInfo.objects.filter(brand_id=administrator.brand_id, status=True).order_by('-pk')
|
|
| 111 | 111 |
if distributor_id: |
| 112 | 112 |
clerks = clerks.filter(distributor_id=distributor_id) |
| 113 | 113 |
clerks, left = pagination(clerks, page, num) |
@@ -94,11 +94,11 @@ def distributor_list(request): |
||
| 94 | 94 |
admin_id = request.session.get('admin_id')
|
| 95 | 95 |
|
| 96 | 96 |
try: |
| 97 |
- administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True).order_by('-pk')
|
|
| 97 |
+ administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True) |
|
| 98 | 98 |
except AdministratorInfo.DoesNotExist: |
| 99 | 99 |
return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND) |
| 100 | 100 |
|
| 101 |
- distributors = DistributorInfo.objects.filter(brand_id=administrator.brand_id, status=True) |
|
| 101 |
+ distributors = DistributorInfo.objects.filter(brand_id=administrator.brand_id, status=True).order_by('-pk')
|
|
| 102 | 102 |
distributors, left = pagination(distributors, page, num) |
| 103 | 103 |
distributors = [distributor.admindata for distributor in distributors] |
| 104 | 104 |
|
@@ -107,11 +107,11 @@ def model_list(request): |
||
| 107 | 107 |
admin_id = request.session.get('admin_id')
|
| 108 | 108 |
|
| 109 | 109 |
try: |
| 110 |
- administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True).order_by('-pk')
|
|
| 110 |
+ administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True) |
|
| 111 | 111 |
except AdministratorInfo.DoesNotExist: |
| 112 | 112 |
return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND) |
| 113 | 113 |
|
| 114 |
- models = ModelInfo.objects.filter(brand_id=administrator.brand_id, status=True) |
|
| 114 |
+ models = ModelInfo.objects.filter(brand_id=administrator.brand_id, status=True).order_by('-pk')
|
|
| 115 | 115 |
models, left = pagination(models, page, num) |
| 116 | 116 |
models = [mdl.admindata for mdl in models] |
| 117 | 117 |
|